User public pages are included. Minor logic and design changes.