Feature/footer qa improvements

Improvements on #932