spruced up the views a bit
Merge branch 'views'