overhaul of layout and content