Big commit containing changes to the  administration and search views