Branch/jquery ui fix

@jessmartin or @davideaster would you mind reviewing?