Layout component tweaks

Use global variables to declare the sidebar blocks.