Henchmen update from Sai
Added display mode switching
Added display mode switching