Layout and other tweaks