Add new footer changes and maruku changes