template improvements, offline tweaks