ui-links-fixes
Merge pull request #6 from surangak/ui-fix

ui-links-fixes