Clean-up markup and add onepage scroll components