Fixed the footer to stay on bottom and out of way
Merge branch 'fix-footer' into dev