Refactoring the AddressBar