Improve panel template