Break after each switch case
Merge pull request #309 from digawp/gui-minor-fix

Minor fix to GUI
Refactoring.
Should fix #306.