update
load more btn
fixing conflicts
merged with colleen's branch