layout fixes for rank