Updated form-control, and buttons