Changes to the ui
Search module almost complete