Improve and fix css, js & templates