fixed tomcat version conflict
bootstrap layout
polishing templates