Revert "Layout didnt save from before"

This reverts commit ceca1baa5e36126851f7751f3bfcd24df0b50916.
Revert 6a9e401..25cdecb

This rolls back to commit 6a9e401d9af8499b15c0ab3ab01c3a82500c22ff.
Revert 7ceb266..31a593d

This rolls back to commit 7ceb26671ff588c0fb88c5a8fd1fc81933588c68.
Revert 6a9e401..a70af77

This rolls back to commit 6a9e401d9af8499b15c0ab3ab01c3a82500c22ff.
Revert because something dumb got messed up