modified something
merge front-end to master
advanced front-end