bugfix
bugfix
bugfix js and style