bunch of styling and bug fix