fix differents layouts