Move type to bedroom column

Instead of a separate column for type, put it in the bedrooms column
Wait for user input before quitting