Adding Shimly support and updating helpers to reflect this.  Also changing g-container to l-container as it is separate to the grid