Navigation fixed. Need to trim unnecessary code.