Some asset organization, css styling and markup re-structuring