Revert "Getting add to work with new layout"

This reverts commit a4b3ab78b1554c435636cb84860d8cd7acb858ea.