Minor visual changes, code cleanup, started changing clickable labels to buttons