Fixing password reset
Reworking display class a lot