surf angle consolidation of variables

Added a variable for the label of the top atom, and another for the
bottom atom.