defer layer menu creation to beforeshow + revert previous commit