putting .ifacebadge segments back
removing empty border declarations
fixing cbi button statements
working out spacing issues