fixing the width to match more naturally
removed a bad css declaration
Merge branch 'master' into development-pre-4.0