Updated UI menus and made them standalone