0650b70742
* Fix sticky footer issue * Fix merge conflict * Aesthetic changes to 404 page
* Fix sticky footer issue * Fix merge conflict * Aesthetic changes to 404 page