fix link and layout