Updated GUI and Fixed Levels
Merge branch 'Alex-Dev' into Gustav-Dev