Renamed files to make harbour submission easier + small UI changes