Added menus and hooks back