auto complete  fix and layout