Working on reset passwords design & fixing some bugs