more tweaks, links please look better now