Adjusted main container and elements