whole new look; refactored beamer code