ARWE-273: Removing scroll bar and making sure long names / company names don't break the layout