Some bugs are fixed, some changes in UI