Fixed broken screenshots and other improvments