Feature/istwcms 4174 ebremner cleanup sidebar code

Check that sidebars can still be added to all nodes (only one per node) and code review all changes.