another major UI update
merge fix
Merge branch 'steve'