Make views a little bit prettier and refactor.