Add User pages and minor fixes