layout enhancements + saving to png