Further styling after some detected bugs