add styles and fix 1 bug