Adding Welcome activity, fixing bugs