some changes for UI