Martin added all info
Added 'Wrong password' function and some design cleanup