Add additional input types to form
Add margin under flashes