refactoring
fix templates and css
fit to bootstrap