Added in subtabs for upgrades and buildings

Also fixed a few bugs
Merge pull request #3 from nthird/gh-pages

Pulling in the sub tabs