Front end first draft corrected

Finished!