Added screenshots and fixes