minor ui updates, margins, labeling