Refactor static pages
Add User