Fixed #1818 related to an overlapping issue on ultra-narrow mobile devices. Also cleaned up the naming of SCSS include files so they properly identify the screen media type in the file name (rather than being inconsistent).
Merge pull request #1826 from pjackson28/master

Fixed #1818 related to an overlapping issue on ultra-narrow mobile devices