edited styling
edited style
fixed tweet display (user to only display first char)
fixed merge conflicts