Add form-control javascript
Update layout
Update JS