Layout fixes
Merge pull request #9 from Wikia/feature/bugfixes

Layout fixes