Modified url-patter and welcome-file tags to properly redirect