Changes in UI, bug fixed