Much nicer room layout logic