Fix small bugs in UI