Terminal and Menu extended