More small format changes and changed order.

Sorry, had some folder and connection issues with my work computer or I
would have included this all as one.  Thanks for the quick response!