various changes to layout