Implementing feature #26. Kept styles up the page and it went down the scripts
Merge branch 'feature-26' into develop