Small fixes and updated screenshots