Form elements rework