Enhance layouts
Finish autocomplete