New view updated
Merge branch 'Front_End' into develop