Third commit - some UI tweaks and better autocomplete functionality