Fixed small bugs in UI