Started fixing with startscreen