Small Error fixes
Merge remote-tracking branch 'origin/Tenji---Front-End'