merging some front end and some back end
changed some line spacing
fixed spacing
Merge branch 'frontend_backend' into development