Other layout fixes for NL