inserted search widget back into view
some changes towards final solution....
applied proper indentation
finalized view
Merge branch 'APD-100-BAG' into develop