Added a scrollable table to not break customer layouts