Use more Beamer macros.