[TASK] Minor optimizations for styles and template