Reverted recent commits that break the website structure