Improve width / height of main container