Work around the Cancel a.button link issue; deal with a slight vertical spacing issue on the same element; clean up a little