Fix positioning on main container elements, again