Fixed bugs
Merge branch 'front-end'