huge update to style and layout