Fix overflow problem and shadow on list