Adapted the views a bit