Changed default navigation order
Bug fixes