Added Keywords Feature and Autocomplete, Refactoring Views for Readability