More changes to the gameplay; UI work done too