Revised login pages to scale better