Refactor using CALayers and 2 progress bar styles