Moved figures and tables to the end