added new styles, fixed bugs