Popup Button added

Minor Improvements, plus a popup button added