Renamed buttons, made them somewhat context sensitive. Added border to viewer drawing.