[TASK] Improve rendering + change js