Fixing other section
Refactoring markup into data