Avoid hotizontal scrolling

horizontal scrollbar can be avoided with these commits.