Fixed UI a bit