General fix and improved pages