Updated form layout to be compatible with Bootstrap 3

This updated layout looks like the image below - 

Add - 
![image](https://cloud.githubusercontent.com/assets/5200842/4263110/cf6679ae-3bcb-11e4-8114-3fca90dec0fc.png)

Edit - 
![image](https://cloud.githubusercontent.com/assets/5200842/4263113/3ff3b4a2-3bcc-11e4-9ecd-15a894e5f030.png)