front view changes
fixed views
Merge branch 'master' into front
Merge pull request #61 from QuillyT/front

Front