Contour UI done
Renamed some basic things