add markup from latest design iteration
make ./run script work again after CLI changes
delete markup from old design iteration
begin defining new base template using markup from latest design iteration
merged innocuous upstream changes