Iteration 2. Refactor to css view