Restyling to change order, and spacing out better
Merge branch 'master' of github.com:WheatonCS/Lexos