Minor fix and styling