Aes/fix close button

also contains on pr #859 because I'm pointing to this branch for my prod build