Refactoring the AddressBar

It's almost finished, yay!