Template/style tweaks
Adding/removing logging