Tab bar update and a few other clean ups.