fix path and adjust common style