improve structure of viewer section