More optimzations on welcome page