fix

- js progress calc
- clean model code
- clean template