Made things pretty, started refactoring out the autocomplete thing into its own controller so I can reuse it places.