diyang suggested some excellent UI changes