fixed overflow and scroll bug