Updated UI

Incomplete update