Added more display options