Route replace and multiple top navigation buttons fixes