Added button and formatting