fixed typo
cleaning up forms and removing unused methods
fixed editing of username