Refactor UI a bit