[TASK] Some small styling improvements