further changes on UI