fix three bugs add new ui
Merge branch 'master' of https://github.com/IdiotAlliance/wcptf