Massive reshuffling of the layouts.
Disable some git prompt bits.