fixed bug issues
Merge branch 'master' of https://github.com/jtirtanata/final-project-ui