Basic UI stuff.
Routing changes.
Merging.