add some buttons/search boxes to DOM
fix merge conflicts
merge commit