front page re style & more modularisation