First attempt at expandable UI
Rework into newer table format