Fixed header issue and maps issue