Refactored style and js out of base template