Fix GUI Buttons

Issue-ID: AAF-435

Change-Id: I8b5e83609176a22b5aa54cac6fd0911488bd707b
Signed-off-by: Instrumental <jonathan.gathman@att.com>
24 files changed