Added the Sherlock Bar and code refactoring