styling and bug fix