[#2] Fixed modal and token fields