removed labels from forms
removed labels from inline forms
some cleanups