Resolve layout changes & styling-main.css