Add screenshots adn minor fixes