GUI fixes
Merge branch 'master' of https://github.com/MrAaaah/AEMI_GameJam_H14