partial refacto - done #MOFO
Merge pull request #23 from Matthieuuuu/refactoStayIndexPage

partial refacto - done #MOFO