markup+grid itin

WIP!
Revert "markup+grid itin"

This reverts commit 0cd510d05666a9430f5dd2c043743eae95ee5eee.