Refactored grid so using comments in the markup is no longer required for correct rendering