Add better support for bookmarks and URL changes
Lots of stuff