Fixes some layout problems
Merge branch 'team9dev' into PowerUsers