Rework on template, added bower