0.5 layout fixes working and verified