Updated layout
Updated timer zone with editing buttons