layout / link fixes