Work on user and page admin, also navigation improvement