Restructuring markup to contain all calculators to grid