Updated Demo

Updated to contain sectioned code and reusable content