Refactor so that its little easier to add new features in the sidebar of...

... the formbuilder