[TASK] Simplify container options and rendering