updated js and css
Merge pull request #26 from cvuong/update-maqaw

updated js and css