*Replace more links with &ui_link call
*Syntax fixes and cleanup
Merge pull request #154 from pcfreak30/master

Replace links with &ui_link call