Clean up template
Improve test screen