Changing the display and state of Buildings

Rolled back last commit. I made this one prettier and gave it comments
since I'm not the only one looking at it anymore.