Merge "Removed horizontal scroll & line limit"