Fix link and layout