Fixed angle values and swapped width and height if nessacary