fixed bugs, styles