refactored looks to MVC model
Fixed tests and styles