Finished initial styles, adding JS control code
Merge branch 'dev'