UI redesign

From @malps13.