Some tweaks to make action menu show correctly.