Improvements to the gameplay & GUI

Unfortunately this is a tad messy, but not much I can do right now