Content update and closes #16
Closes #18
Moving towards #17
More mobile tweaks