More work on viewer app