Applied new functionality for cached version
Fixed some javascript functions