Added an extra option in the admin options and enhanced the display logic