Fixed the scrollbar/overbite issue without hacking