* Added link grouping
* Added server side validation