Added button and modifications