Cleaned up code/class specificity

Made only one submit type button, deleted some unneeded code a
regrouped some items in CSS.  Added more specific classes in CSS to
provide clarity.
Merge branch 'master' into gh-pages