styles and bug fix