Removed hack for footer
Merged classes