Cleaned up template modal