css, templates - small changes