Added trade calc link and relocated "change pass" link from each "role if" to the universal links, right above the PHP block.