Non square layouts fix