GUI changes + corrections to the project solution