Fix queue and add jsp file