Fixing 404 page shell
Merge pull request #361 from mapkyca/fixing-404-again

Fixing 404 page... again