Displaymode switching reworked