Fixes and Footer