some changes to make UI easier to understand