Fixed patience display and progress on one.php
merged conflict