- Adds Poll permalink
- Some refactoring