#4 more changes to layout and styling