Changed template to bootstrap and pushing decorator pattern