changed User / Flat / Room views and controllers