Major restructuring, layout changes and styling