Weclome screen and some other UI changes
Merge