layout changes
fix tests