Merged view changes from weekend mucking about with spotlight controller