Update screenshots and remove TODOs