Improvements to chemistry layout