Refactored layout, merged blocked template into cookies
fixup! Refactored layout, merged blocked template into cookies