Continued the source code improvements; also the Welcome screen is disabled now