Minor UI changes and link re-organization