More changes
Merge branch 'ft-GUIDesign' of https://github.com/IJoshFTW/UFM-Reckoning into ft-GUIDesign