Move extras to after Q&A