Improvements to the gameplay & GUI