Clean code and some css style
Begin refactoring view