Fix the conflict

remove something about the "pinlist"
Fixed conflict in WebUI

Fix the jsp