Fix auth and page layout