Mended the UI

Created a new branch working.