removing spurious reference to moment; adding layout name test back into main menu