Fixed button and added js imports

see summary