Fixing, improving(?) layouts.