add plugins and minor fix design