Add and remove room selection

Add and remove room selection buttons are now functional. Also this will
bring the files here up to date from changes that have been made by
others.