fix bug: fix frontend bugs
Merge branch 'development'