Added space for error page
Merge branch `web` to `master`