Re-factor the signin page to be more modern
Upate after merge