Refactored client code; Added bootstrap modal form