Reorganised menus + ui corrections (fix #9)