GUI fix and GUI code
Merge branch 'master' of https://github.com/Mackan969/JWaterSport.git