- removed header-block due to the latest design changes
- codeformatting