Added buttons on the dialog but they don't work :-( (Need help on this
later)