UI clean up

UI clean up