Integrating themes in teaching an undergraduate course: the cases of intermediate microeconomics and principles of macroeconomics