Change style & fix path issue