[TASK] Improve menu rendering