changed label and fixed navigation bug