Updated layout again, 1/2 transition to 12hr time