markup upgrade; progress-bar&back-button wip