#UI code maintenance