UI/JS Improvement