[master] fixed some visibility issues and added an error page.