4.1

Please don't merge until we are closer to launch.

Outstanding issues:

1. Styling of the search input group needs adjustment (button is not aligned correctly)
2. Testing