Improved main viewer to contain buttons