Updated UI

Just about finished.