layout, styling tweaks
merged layout branch