Correction of bugs for requirement 32 + problem with welcome page