Introduced webjars + minor improvements