A serious bug is fixed and a template redesigned
conflict fixed