Made the views a little better