commit 6.25
6.25
6.26
Changes to GUI logic
More change GUI logic
commit 6.27
6.28
Merge with Jia