worked on password and design
merge work 21 aug