Making the design better

Also adding more pages for the buildings.  Several pages are not
displaying maps properly, fix should be in the next commit