css cleanup, templates and demos