Tweaked GUI, added zero checking