Ui enhancements plan

UI brush up is done.