GEM:86 fixed the links things and upgrade spacing