Added cancel button and visibility of action buttons.