Added screenshot and fixes