Cleaned up presentation viewer