more styles and fixed bugs