Add updated style and layout structure
Update global layout and strip back styling