UI updates and interests code cleanup
Merge branch 'steve'