Layout tweaks

Made 2 layout tweaks, check the commits for more info. Comments on the changes are appreciated. I felt these changes made it more natural.