more ui clean up