Neater UI controls + basic temporary icon