Tweaked the views to clean them up