Update screenshots and final merge