General fixes to presentation