Fetch earlier
Fix some z-index issues