Fix merge problems
Fix borrow-check and repo errors.
Compute percent widths/margins properly and fix numerous small visual layout bugs.