Add container markup to 404
Remove trailing slashes