Update UI

Mostly finished