Added per capita subscription and fixed style
merge with master