Updated settings and viewer