Added button inputs and new messages