#10 fixed minor ui bugs