refacto
correction bug layout