Update maps to avoid collision issues, Update splash screen