Updating form layout

Included Bootstrap toggle buttons.