Merged changes to fix footer spacing and disclaimer positioning