Removed switch widget
Refactored profile forms