refactored, back to single layout, routing added (not working atm). Moving towards single page app