Structural changes to sidebar and main view