modal and buttons final touches