Polished some ui