Style fixes
Rename includes
Use footer hooks
Some style changes
Minor changes and compilation