Dialog and Menu enhancement