Changed layout, changed password generation