Fixing the libs
Added changes to display welcome screen only once and exit on back button
Resolving conflicts