Remove jQuery usage (angular will use jQuery behind the scenes); Minor fixes