Fix (some) styling issues