Added some menu functionality