Added autocomplete fix and other customisations