Bug Fix and GUI improvement.