Fixed upper border issue