Fixed issue with popup transition and buttons