fixed routes post merge
fixed navigation (merged doubled things)