comment out unused markup for now, other small UI adjustments