improve org template design