Re-arrange the order of width and height in the code

In some places in the code, the width was before the height, in some
vice versa. An option when the width before the height is more
expected. In the files where the changes will be made, this order is
made.