fixing design and layouts