1.2

change UI and simplify some structure