major overhaul to layout and formatting