DAR-663, fix layout bugs for liquid layout
Merge pull request #1098 from Wikia/DAR-663

DAR-663, fix layout bugs for liquid layout