Fixed several undeclared variables
Fixed broken caption
Making the viewset editor UI more stable