fixed the files, they are cleaner and we generate the welcome page from a function in commons.