About me styling
Fixed merge conflicts