Small viewer additions