Reworked the frontend forms to match the Bootstrap markup