Polish more UI