bug corrected
ui improved