Bring in layout changes/options from Mi-Code

Special Thanks to the MiCode community