Update to new function names
Simplify layout menu toggling