Bug fixes

Updates to grid and width bug fix on line 441