1. Design refactored
2. Added features:
   - Add template on UI
   - Remove template on UI