Merging Angel's misc changes and r-justify-cell class name fix