Renamed folder and minor ui update