Fixed mapping in homepage