Extensive Fixed Layout changes