merge issues
changes to splash and login link
changes to splash and login link
merge issues