Add js and includes
More includes
Fix templates