Preliminary changes to fixing Sidebar Options