UI Clean ups