Update to assets

- Fixes #1990 
- Fixes #1991 - and updates design as closely as possible
- Fixes #1995 - using cache control