some fixes: buttons, search