Prevent HTML/JS injection
Re-arrange asset files
Tidying up