complete rework on core website layout