Removed duplicated defines
Changed page names to their actual names
Merge branch 'master' of github.com:IFA11B/ITAdmin