more buttons, popup, design
fixed merge conflict