Clean up and adjust layouts to save space