Added button and Timestamp