Major Changes to Client and Admin Pages