Fixed some layout performance issues.  Fixed bug on resetting running_since