UI work toward fixing #7, #36