Some minor adjustments, search view added, now awaiting functionality