fix alignment of buttons in popup, change span to div + css fix