close #39 Refactoring of views. + Refactor css.