Fixes for menus, refresh