Fixing header sizes
Tweaking layout