Added retrace button and intent with extras