Major update on menu and side bar