Fixed Screens

Unified Default buildings and rooms screens