Make viewer on right, simplify pkg