updated view pages
fixed caching and add charges