Cleanup layouts and organize toggles more efficiently