Added real content to Browse page; terms work w/ search
Resolving conflicts