Added a lot of minor tweaks to improve layout