Updating login to match core theme and cleanin it up a bit