cleaned up the UI a bit more
some merging and some adding
Merge