UI improvment, fix other problems