Added bootstrap and js refactor of elements