fix ui and little bugs