added style & changed order