Fixed UI related bugs