move helper to new module
move javascript a little