Merge "Slight reordering and add settings to compose menu"