Feature/frontpage #34