New Welcome Screen added
Fixed Merge Conflicts