Changed button names for consistency.  Added style changes.