markup clean up and preparing app to use partials