better content data layout & links fixes