More flexibility

Add some more flexibility to the main view :)