use jade blocks
fix table display
use new db format