Handled some disconnect issues and added up navigation