Add Units

I made several smaller changes to the master branch with the changes that were mentioned. This branch adds the unlocked unit status tab.