force layout fixes