Some fixes and added custom footer