Fix construction, weird jumpy menu selection