updated welcome page and did login page
merging