Improve some ui
Refactoring styles