Added room class and edited the forms