added more controls, updated images
Merged Rooms