improved the UI a bit more