bug fix and styling