More GUI and Container Clean up