Added more advanced display options.