Some UI changes

Fallback to the previous commit if this doesn't work..