dragon changes, layout fixes