some code clean, and UI modification