Reworked context design
Added menus