Fixed some links & 1 design problem

:-)