Some tweaks in the auto layout