Link and alignment fixes

Link and alignment fixes