Fixed overflow and allowed scrolling on splash page
Fixed conflicts