Tweaked the views a bit