fixed bug with links merging + improved visual