Fixing some things the merge busted
Committing what I have, I don't like this back button
Little more work on the navigation, making use of the backbone history now, still not sure I understand it right