Massively improve the UI