Restructured pages to fit better with authorization model..