completion and UI fixes on mac