some aesthetic updates in template