added form-group and fixed spacing issue with buttons