UI change & bugfix
Merge