Some changes for the actual beamer setup