fix misc bugs
improve ui