Overhaul of layout and styling