4364 Fix styling issues