Added menus and bars
Reformatting similarity