Some minor navigation changes