Fixed some bugs
Merge branch 'restructure-and-ui-change' of https://github.com/Astonex/Antox into restructure-and-ui-change