A few edits, lots of cleanup and such.

Units activity currently not working as trying to put in navigation.