[TASK] Optimization selectbox and templates