Changed Frontpage according to #15