changed layout and add auto completion