minor fixes
update
tweets on the main page
fixes
load more btn
fixing conflicts
merged with colleen's branch