DAR-1770: Less magic, more jquery