Renamed functions, added margin to progress bars