Make our UI code neater