Layout changes correctly now