reverted back to core layout, fixed links