cleaned up layout_changes, started working on new layout logic