Modifications on style, templates and js