BUGFIX: html output was messed up by some return statements

instead of using return, we now use a break, this has the advantage that extra output (such as menus) will still be present and the html should be ok.