Starting to revamp viewer