Renamed ui and cleaned up minors