docsing
merge
add front-end style