Fixed UI a lil bit