More GUI tweakin'
Merge branch 'smp'