Further UI and Game Logic work