More spacing at top
More fixes
Fix
Small fixes