Merged UI improvements with initial running tracking.