Fixing header section, reducing code complexity & layers.
Removed unnecessary id.