refactor js
update styling
test