Re-worked XML layout for running.