Added tweaks to layout