Improved admin and replaced pages by references