fixing merge conflict in compiled js, adding in progress parent
putting progress parent in main layout