Merge pull request #11 from viperchris3/work

Fixed some UI stuff