Added simulation labels and some layout changes.