Some work on fixing password screen glitches