handled review comments on UI design part