Updated and fixed viewer