Updated with Timeout TTO and Larger buttons