refactor css, edit form labels