Fix Init Clock + add Modal popup