Theming proposal statistics block and proposal edit page
Fixing merge conflict (I hope)