Fixed some button interaction
PopupFragment now works properly