some styling + bug fix