Fixes #217 and Footer Cleanup