Some GUI changes
Merge branch 'master' of https://github.com/Dawars/The_Elysium