Refactoring, adding omnibox functionality