styling the intro screen
fixed merge error
fixed merge error