Revise markup and add sass variables
Merged in steven's changes and resolved
Updated some stuff and resolved