adding form widgets and fix tags