Merge pull request #8 from skiyooka/master

Updated layout and tested on Mac, Windows, and Linux
Merge pull request #10 from skiyooka/master

Big code refactor in preparation for the code export