Form fixes for Bootstrap 3 migration