Added error UI
Added a dummy search controller
Added some dummy error lists
Merge remote-tracking branch 'origin/master'