Remove the extra layout

I never use it anyway
Rearrange the order of the layouts