Modified the views a little bit