layout fixes for v1.0