Split general options and room settings into separate menus. Fixes #731