work on screenshot robustness, view cleanup