Simplified UI

Switched to basic container, row to clean-up some visual glitches (boxes
were overlapping and out of place).