Menu functional imp., other fixes