Some br layout fixes