Fixed GUI and CLI