change popup and add button bar