Feature/maaz footer fixes