More progress on the gui