improving ui class