Some fixes and new footer