bug fix + styling