more css changes, templating changes