Fixed spacing of derivative text, shortened transition delay for row buttons
Merge remote branch 'upstream/master'