WIP: Styling and class name changes in form builder