Fix Nav, Add BaseController