updated nav
added rooms states and controller