improved adding back whitespace and cleanup GUI class