Added 'what' to rootScope and tweaked controllers