place selector and menu fixes