Fixed link button not being correctly built up.
Merge branch 'develop' of https://github.com/leerbedrijflisa/kiwi into develop