Add Welcome Screen + improuvments