Fixing setup pages