Refactoring

Including bootstrap template
cleaning spec