Updated UI

Finally resolved all conflicts…