Better welcome page management