Layout and Links

Fixing layout and links.