Fix focus issues with menu vs item, Unify menu appearance