Fix the remaining issues with the scroll bars