pimp the UI a bit