Welcome screen support + bug fixes