Reworked a bit skipping homepage