UI changes and some code clean