Improvements to PresentationBuilder to reduce input file syntax