Homepage, Articles fix
A merge with Andras code, includes Homepage and Articles fix