Refactor layout index rooms