Added support for separate theme layout for grade reports