Fixes search - adds views and basic functionallity