add header and fix margin