bugfix & tiny changes on UI