tweaking ui.
also some re-organization.