Fixing up the views a bit