Improved lecture markup