Minor UI and code clean