various UI changes, pre-json parsing commit