Clean up the views a bit