Added better viewer inspector