some tweaks to layout