0.3 layout fixes