UI Updates

More edits
Merge branch 'M7Branch' of https://github.com/casey2161/SpaceTrader into M7Branch