Fixed buttons issues and added room sizes